From: Glenn Morris Date: Tue, 18 Jan 2011 02:35:23 +0000 (-0800) Subject: * admin/bzrmerge.el: Fix paren typo in previous. X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~5162 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=d599f2f185c0271c6238bbd616f49ab784a6d5cc;p=emacs.git * admin/bzrmerge.el: Fix paren typo in previous. --- diff --git a/admin/bzrmerge.el b/admin/bzrmerge.el index 68b107be65e..85d0f14091a 100644 --- a/admin/bzrmerge.el +++ b/admin/bzrmerge.el @@ -281,7 +281,7 @@ Does not make other difference." ;; are conflicts. (display-warning 'bzrmerge "Resolve conflicts manually. ¡BEWARE! Important metadata is kept in this Emacs session! -Do not commit without re-running `M-x bzrmerge' first!"))) +Do not commit without re-running `M-x bzrmerge' first!")) (error "Resolve conflicts manually"))))) (cons merge skip)))))